Mechanic found corrosion on two pins of a connector that goes into the main ECU module apparently. Cleaned it up, and the car's been fine since (4 days so far), touch wood. Didn't charge me anything extra as he said he should have caught it when he was swapping ECUs over.

Car seems to be running better than it has in years too but that could just be placebo.